Merge tag 'upstream/2016.5' into debian/master
authorSimon McVittie <smcv@debian.org>
Sat, 16 Apr 2016 21:22:20 +0000 (22:22 +0100)
committerSimon McVittie <smcv@debian.org>
Sat, 16 Apr 2016 21:22:20 +0000 (22:22 +0100)
commitfa16aa840103af871cd430d4bf3aa351db1851f1
tree0bc2e82c57468440a7f99fe3d4f6cb6285b13b53
parent03171dc0d92894db0dc0e374159fd16fd547dcc8
parenta7b5654e44c45f9367429846d92f2553839e56a6
Merge tag 'upstream/2016.5' into debian/master

Upstream version 2016.5